Second revision of the hashtable project