New attempt at Java 5