basic alarm
Merge branch 'overProgressUpdate'