diff --git a/signalgen.py b/signalgen.py
index 99656a4..e1c2d4f 100755
--- a/signalgen.py
+++ b/signalgen.py
@@ -46,9 +46,12 @@ def show_dynamic(
     """
 
 	#downsample the spectra first
-    downFac = 24
-    logging.info(f"Downsampling...")
-    decSpectra = signal.decimate(dynamic_spectra, downFac, axis=0)
+    downFac = np.shape(dynamic_spectra)[0] // 128000
+    if downFac > 1:
+        logging.info(f"Downsampling...")
+        decSpectra = signal.decimate(dynamic_spectra, downFac, axis=0)
+    else:
+	    decSpectra = dynamic_spectra
 
     spectra_mads = median_fitter(np.median(decSpectra, axis=0))
     flat = decSpectra - spectra_mads
@@ -85,7 +88,7 @@ def addBurst(values):
 	filterbankObj = Your(values.file)
 	values.file = values.file.strip(".fil") #removing extension for text manipulation later
 	basename = path.basename(values.file)
-	samples = 524288
+	samples = filterbankObj.your_header.nsamp
 	
 	#the full filterbanks use 64GB in RAM when injecting burst, so we write out a truncated version and load that instead.
 	filWriter = Writer(filterbankObj, outdir="./", outname = f"{basename}_trunc", nstart = 0, nsamp = samples)
@@ -205,7 +208,7 @@ if __name__ == "__main__":
 		logging.info(f"Running with file {values.file}")
 		if values.plot:
 			filterbankObj = Your(values.file)
-			spectra = filterbankObj.get_data(0, 524288)
+			spectra = filterbankObj.get_data(0, filterbankObj.your_header.nsamp)
 			show_dynamic(spectra, f"{values.file} Dynamic Spectra", save=True)
 		else:
 			addBurst(values)