Shuffled some stuff around