XD-823 - changed to router