updated for dedicated or controller node use