Improves cluster solution

[finishes #67241182]