debug & reorganization