Updated for changed paths