changed routing method