some changes
crap