Changed java 7 to java 8