added better routing