improve the code
none
actualise the new routing
add more information