making a lot of changes in alarms and in the models