FIX ensure order information is saved between steps