Update , Reorganize