Made some modification