We recommend that the PBS Commissioner provide appropriate oversight to ensure water is safe to occupants in its buildings by incorporating PBS’s water safety oversight responsibilities into quality assurance surveillance plans for O&M contracts to ensure contractor compliance with water safety activities.