some changes

done some magic