modified forwarding code, up for recheck