changes for Java8