updated with alarms