some changes DUDE! (2)