Sahil's parse changes
Merged Neil's codde with Parse code