Upgraded to BS 3.1