Slight changes for alerts