Removed BB Stuff and fixed NoMotion