BS 3.0 WIP updates