some modification done