More repathing