Did some more reorganizing the updates.