some changes #2