Rearranged Things a bit