Added Logging - commented out.