began remaping tokens to work on BBB