Start adding saferoute into rwl