Recompiled for Java 8