Add comments and debug message