Switched to Java7