updating to latest changes in render-refactor