customized BS

More tweaks