draft v0.1 changes added