Made changes to parse the comma