updates, reorganization