some modification on 141011