parseArguments modified