Homer's changes