Java 6 again; plus forgot one copyright header