more changes to restore state from yesterday