more updates to try and fix squash notifications