Add states and fix order