Updated to current BS 1.15.xx format