java changes in new branch