Reorganize and update min.'s