Update and Reorganize