changing to one lookup per run