Switching to Java 6