Converted 8 to work with Hash Table