changes to Java stuff