Basic changes v.0.1