Rewritten with guava