v0.3 todo added