Updated for new paths