Did more work on renderer