Path code redesigned.