add proper routing