some changes !!!