java files
more changes in java files