java changes to account for oops changes