shuffled things around a little bit