Added some BA stuff, still sucks