Upgraded to Java 1.7