preliminary rework for subnets