*Changed javadoc comments