added process_alarms
resolved merge conflicts