tested for water_i, works fine, let's kill this