additional routing improvements