Added More B+ changes