Some adjustment of new second version