changes to return in parser