Feature/better suggestions