0204 changes (HashTable Done! :) )