Path improvements phase 2