Updated following router and template