Mike's edits part 1