reorganize and upgrade tim