Extra changes to notifications to try and prevent inaccurate notifications