Switched to global state
merged