Ethan's changes