The following amendments, and/or additions are made to Article 695 of the National Electrical Code: A fire pump shall be supplied by a separate service from the utility transformer. A fire pump shall be permitted to be supplied from a connection located ahead of the service disconnecting means when a back-up on-site generator is used as an alternate power source to feed the fire pump. Electrical requirements for Diesel Fire Pump Controller Power Source per NFPA20: Diesel Fire Pump controller shall be connected to the emergency power source such as standby emergency generator. If there is no Standby Emergency Generator, Diesel Fire Pump Controller shall be permitted to be supplied from the battery. There are two storage battery units shall be provided and rack-supported above the floor, secured against displacement, and located where they are readily accessible for servicing and not subject to excessive temperature, vibration, mechanical injury, or flooding. Storage battery units shall be provided with battery chargers specifically listed for fire pump service, arranged to automatically charge at the maximum rate whenever required by the state of charge of the battery, and arranged to indicate loss of current. For diesel driven fire pumps, verify that the following alarms related to battery are provided on the controller and operative: Battery failure/battery missing; Battery charger failure.