Added notifications... lived hell