Used proper routing