More updates to routing - what a headache! >_<