More changes for rendering