Improved rendering