yekam taghir va refactor