further implementation on setup route
fixed routes bug