Modified to fit new paths.