new routing
updated js