Code review
push notifications added