Modifications for cluster mode