re-arrange args to be less annoying