Some Changes almost v0.0.4