Changed parseExp and parseArg