Now with true buckets for two-opt