device update
improved routing
improved routing