Commit 9 - more changes to last alert