Feature/suggestions