adapted javadoc