Changes to path generation