re-adding javadocs