updated lookup scheme