upgraded to java7