changes to java 1.6.