Doing some changes...