Revert "Revert "swapin comps""

This reverts commit 43387f84847872bd830f8f67e234e02e1ab566cd.