Removed old javadoc
Added new javadoc