some changes for finishing