updated to reduce the logging