Refinements of previous commit