*Updated javadocs