work in progress - keeping same code for infrastructure clusterMode on