rearranged everything for submission