upgraded to Java 7