converted to new Rich functions, google guava pom fix