Richmond roundabout upgrade and Countdown build ahead of sch