Changing from hash based to not-hash-based