final changes v0.1