Switched to raw cell-rendering
New Version