Added Logging and control changes