Add notification, fix Master after switch