Modified forwarding logic