Added additional render component to plug, finally removed old code