modified receiver to use router
updated version