Modified routing logic