added bs stuff back