some changes in task#87