Final Commit before changing to bitset