Fixed routing issue, changed routing engine