re-added no infinite water