undoing some changes, adding some new ones.