remove inner join; add join