Added basic notification
Fixed merge