more work on the java side