Comment Fixed, Hashtable in progress