Modified both of these files to use the new operating_conditon_change service.