some changes in java classes