v0.0 - Some changes