rearranged some templates