Finished the lookup and all related changes.