Change ordering in SotA