Changing from lookup to resolve