Changes made by Ethan on January 27th.