Loading updated to BS 3
Merge ../x0y0