more lookup changes