harvest refactoring #fixes 13