Removed 2.1 b & r finder, implemented better method for finding b & r