BS WIP update
Revert "BS WIP update"

This reverts commit 09fb89ae2180f719451cfce7f51cc0da048cfb76.
Ignore this