Made a fix to match the state order based on what I found on other examples.