re-doing routes a little