Advanced water safety