Improving BS support
Improves BS support