Fine tuning order change