added javadoccomments