added master-specific stuff