switching the lookup to be based on id