Improving Water Quality without Compromising Long-term Safety