0.2.0 rework 1