update from trung v-0.0.1