Refactored Tell to Forward in some places