! fixing bugs with notifications