5.1 Bounds issues sorted