move this outside of the previous lookup logic