reformated and rearranged