Updated for recent path changes