Changed to completely different route switch methods