#62 improvement with notify