Start implementing Peter's comments