Adjustments for new path