Changed the execution order in the "standard" procedure