reorganize and update info