working version with original HashTable