adding notifications, renovating code