shuffling things around to make actual sense