Recompiled for java 8