Changing to Java 6