Bit of args switching to keep old users in running order