More tweaks, it should be static to clear the site side notifications.