Bs3 updates

It looks like you have not made any changes yet so these changes should be a clean merge.