Render logic added