Update how PATH is handled