some changes from kupol - 2