some shred moving fixes, yet not stable