Improved rendering: