merged Harry's refractoring results