Yes and also National railways is installing watertap points as well 🙂