Mike's revision part 1 finished