Path improvements phase 4