lookups refactored