more changes to .java