rearranged some content stuff