router is now simplified