Upgraded to Java7