Shuffled things around a bit