xvc1, and some reshuffling