Added notifications and help