Revert "Replaced WARP"

This reverts commit febccd11a9f9a1e993a1f21f25c3f58742044692.
Fixed TA breaking code