Clustering ServiceControl

based on Calum's comments
fixed