adopting some older systems, adding javadoc as well