recommit from FivePhaseClarke