new stuff for router handling
new stuff for router handling