tidy up order of run