added the extra step for forwarding and shit