Refinement from previous commit