added Rons changes for configuration and security