Small changes in the rendering class