Updated for new paths.