Changed the way the arguments are parsed