remote: A bit more shuffling