more updates after router refactor