added new forwarder but its a little buggy