Redoing some changes.