cleaned up passing previous state & made model changeHandler more user friendly format