some modification done.