update according to iteration 0.2.0