subtask3 some changes