Map state 2 digits as well