Updated to use new state locations