some changes #25