More rearranging and editing