a little more work on the java