LOS ANGELES, Calif.–Public safety agencies are hoping to indelibly connect the end of daylight-saving time with the need to change batteries in smoke detectors and make plans for emergencies, officials said today.

Like 47 other states, California will “fall back” one hour at 2 a.m. Sunday, when daylight-saving time ends and the state moves back to Pacific Standard Time.

Unlike in years past, Tijuana and northern Baja California are shifting to standard time on the same date as California. Last year, San Diego and Tijuana were one hour apart for several weeks because Mexico changed to and from daylight-saving time on different dates than the U.S.

The only states that do not observe daylight-saving time are Hawaii and most of Arizona. Starting Sunday, Honolulu will move to two hours earlier than Los Angeles, instead of the current three-hour difference.

Phoenix and Los Angeles will have the same local time for the next five months.

Fire officials and FEMA are urging people to use the semi-annual clock changing exercise to also remove and replace batteries for smoke detectors, carbon monoxide detectors, and evacuation flashlights.

The battery-changing ritual should include checking that the device has not passed any expiration date, and clearing dust from slots or sensors.