changes for new FinalLookup