Everything rearranged and whatnot