Added notifications, etc.