with inter lookup changes