updates after refactoring changes to master
3 files changed