updated some references added guava