Revert "Revert crossfaction"

This reverts commit 329b78922849587c76b6351e4b4d3583f88cdcbd.