refactoring to conform to latest archimedesJ