Fix
Merge branch 'graphics-refactoring'
Remove week
Merge branch 'graphics-refactoring'