Pouring water exercise, and some other changes