a few changes on Implementation and Discussion