Store state in correct place