added proper routing