changed argument parsing method