from java 6 to java 7