updated as a result of package refactoring