not finneshed
Merge branch 'old_code_revisit', remote-tracking branch 'origin/old_code' into old_code_revisit
refactoring rendering improved