Changed order of args. Relates to #1