updated lookup to be more succinct