notification is now depending on user
code cleaning
code cleaning
code cleaning