continuing the java8 update
more java8 stuff