refactored for new version of soaunit