Added comments/Logging/Tracing