changed to Java 1.6