Update & reorganize