updated to Java 7