final commit V 1.0