merge
Added watering animation