Worked on the parsing part