i have finished some changes