Modified order of routine