moved count to Bucket