Also need to change values to hsh.values