First attempt at fixing nofications
Tested! Working!