Step 2 render refactor