updated router and core controller