more work on Java