Fix conditional
Fix conditional
Get an instance of BWP to load functions
Make function public for now

Would be better to have filters