i have make a few change