update with better routes