refactoring, patched new iterator into renderer