Begin modifying for alarm implementation