UPdated to jdk8