More tweaking on cluster