working on router handling