Update for Renderer, getting ready for company support