change order to respect what dev has to do