some changes DUDE!