Updated tool paths - 2nd attempt