Swap order of args, and allow hash arg