Tyler and Andre: Adding back the blocks with the correct Javadoc code.