changed the argument parsing