added buckets and keyboard control