upgrading to Java7