updated router class