Title: Better alarm handling