Slight modifications to the render logic