switched to Java7