updates after refactoring changes to master
7 files changed