updated for new paths