commit
Merge branch 'hardRefactoring'