Some litte chnages