router rewritten (again)