added more JavaDoc