added more route logic