Updated with changes I don't remember.