some changes

pls merge