Bucket is now as fast as linear, still need to speed up updating