changes for v-0.6