toLookup added and fixed