order step2 fixes