Change state to be max+2

Update Class indices accordingly