Commented extra notifications and non functional features