Upgraded to Java7.