Improve debugging section (disabled)