Updates after edit 1-5.