Improved commentary