fixed parser and added flexible arguement