Add notifications in different case according to story 7