Not gonna implement the 9 states in 2.11 for now...