Much cleaner B Functionality