changing to Java 8 features