Updated state controllers