Revised water demo