changed routing order