make better routing