Rewrite of notification

Please kindly review ;)