Final refinement vor 1.0.3 version