Official Bet version 2 - Fix bugs