Few More Custom Changes to BS