Changes to Suggest()