diff --git a/app/adaptiveorbit.py b/app/adaptiveorbit.py
index af1f089..1aba1ef 100644
--- a/app/adaptiveorbit.py
+++ b/app/adaptiveorbit.py
@@ -27,8 +27,8 @@ class AdaptiveOrbit:
             idx = '070'
             if bpm == 5 or bpm ==14:
                 idx='410'
-            self.ATchx.append('SATUN%2.2d-DBPM%s:X2' % (bpm,idx))
-            self.ATchy.append('SATUN%2.2d-DBPM%s:Y2' % (bpm,idx))       
+            self.ATchx.append('SATUN%2.2d-DBPM%s:X1' % (bpm,idx))
+            self.ATchy.append('SATUN%2.2d-DBPM%s:Y1' % (bpm,idx))       
         self.bsAT = self.initBSStream([self.ATch0]+self.ATchx+self.ATchy)
         self.pvAT = self.initPV(self.ATchx)
         self.kickerAT = self.initPV(['SATMA01-MCRX610:I-SET','SATMA01-MCRY610:I-SET','SATUN05-MCRX420:I-SET','SATUN05-MCRY420:I-SET','SFB_ORBIT_SAT:ONOFF1'])
diff --git a/ext/bscacquisition.py b/ext/bscacquisition.py
index dd7fba3..c322eba 100644
--- a/ext/bscacquisition.py
+++ b/ext/bscacquisition.py
@@ -24,16 +24,17 @@ class BSCAcquisition(Acquisition):
         data = [queue.__next__() for i in range(n_pulses)]
         # write out the data file
         hid = h5py.File(filename,'a')
+        # save the pulse ID
+        singledata = [ele['pid'] for ele in data]
+        pidname = 'pulse_id/group%d' % self.grp
+        hid.create_dataset(pidname, data = singledata)
         for chn in queue.channels:
             singledata = [ele[chn] for ele in data]
-            gid = hid.create_group(chn)
-            gid.create_dataset('data', data = singledata)
-        singledata = [ele['pid'] for ele in data]
-     
-        if self.grp == 0:
-            hid.create_dataset('pulse_id', data = singledata)
-        else:
-            hid.create_dataset('pulse_id_grp%d' % self.grp, data = singledata)
+            if not chn == 'pid':
+                dname = chn.replace(':','/')+'/data'
+                hid.create_dataset(dname, data = singledata)
+                dpid = dname.replace('/data','/pid')
+                hid[dpid] = hid[pidname]
         hid.close()