more work on Driver.java