Almost forgot javaDoc for a few methods