Notifications still not working, but code is trimmer