some changes done !