Restored the state and notification functionality.