new changes for v0.1