Removed old path generation, replaced it with new generation