Now mostly working with BS3