Alarm handler updated