- updated to use latest java-util