Some more planning for alarms