rewrite duplication
updated routes