set of changes for single master setup