Added changes
Reverting 911470c6de97e874e94266547ffbf155700c2cd7
Reverting git revert 911470c6de97e874e94266547ffbf155700c2cd7
Adding changes that Vasanthy had suggested to get parse notification working