Upgraded to java 1.7 code