Update on Implementation and javadoc