Big Update / more function to Alarms