! * rename rolled BKYDAS1-6 to BKRDAS1-6 (per naming convention)

! * move definitions of DDASA1, DDASA2 drifts to ALINE.xsif and rename

! * add three quads QDAS1b, QDAS2b, QDAS18b for compatibility with 8 GeV

! * reduce number of kickers from 7 to 6 (T. Beukers)

! * correct minor error in kicker length formulas

! * move PRDAS14 to center of the drift between quads QDAS14 and QDAS15

! * move PRDAS17 to upstream side of QDAS17 to avoid interference with BXSP1H

! * match DASEL to new trajectory between BSY pulsed magnets and BXAM1

! * increase x-offset of DASEL line between DC-bends from 35 to 40 cm

! * add a note that BRDAS2 is a merge DC-bend which is turned ON for

! DASEL beam to A-line or OFF for beam to A-line from BSY pulsed magnets !

! * add Y-corrector YCDAS1 (to compensate for missing trims on BYDAS1,2)

! * move YCDAS15 downstream and rename to YCDAS17 (for better phase) !

! * remove weak vertical bends BYDAS1, BYDAS2

! * roll kicker/septum to compensate kicker vertical angle

! * rematch geometry & optics to compensate kicker orbit & dispersion !

! * change quad type from 2Q10 to 2Q4W

! * rename QDAS1 -> QDAS1a, QDAS2 -> QDAS2a

! * resolve interferences:

! move QDAS1&2 and BYDAS2 0.815 m downstream

! move QDAS19 0.6 m upstream --> this will move QDAS17 0.45 m upstream

! * increase the number of kickers to 7 and move them 3 m upstream,

! note: this will also require moving dumpline BPMSP1D 3 m upstream