suggestions logic improved