[sprint-35 some modification]