made a few change