Merged with Johns javadocs