javadocs adapted