some changes :)