fixing things
Fixing the order