Merged Ethan's changes correctly?