some changes 8)