some changes 2 ;)