CX-021031: CFA-664 Fire Water Upgrade and Building Modifications