some changes DUDE! (3)