Completed JavaDoc