reorder state overloads - thanks frabbit!