Upgraded to jdk7