Sequence of changes:
1- Introduce MDH1/2 in the CAD. The CAD models are available also in the UCN beamline. Let me know in case you cannot find them.
2- It was decided that quadrupoles QDA9/10 will be between ADL1 and ADL2, not before.
3- The bending angle of ADL1 and ADL2 is 25 Degrees. Make the length between ADL1 and ADL2 as Little as possible, as long as both QDA9 and QDA10 fit between them.
4- Move the target to the right, as Little as possible, such that all the beamline components after ADL2, fit before the bunker wall.
5- Between SD2W and MDH1/2, there should be 1 meter.