rewrite buckets for performance (for loading lots of files)