some chages for the branch

yhnujmik,ol.