Improving BS support
Improves BS support
merge conflicts resolved