WORKING ON STATE LOCATIONS