adds update routes
Merge branch 'zo' into gmerge