improved the default notification controller and the default listener