working better, adding notifications