Cluster re-do (pics)

Looks good.