rearranged some material