Some Changes v0.02