Changed how changes are being applied to states