some changes :-)