Nice rework of mercy Jeff