3rd refactor edits
Merge branch 'refactor'