added more suggestion changes