Fixed state ordering and moved AER 1513 mods to the bottom