added more content and rearranged