Legacy HW2 merge code complete