java8.fi stuff added