Change #170: add water to water bucket

and remove water bottle