switching over to using routing model