some changes
changed to java8