Path improvements phase 1