nowe gui, spory refactoring