Doing some changes.