Shuffling data.extra stuff around