Changed routing and added budgets