added parser code.
fixing merge issue