Refinement of previous commit