added new subpages
merged area
merged draft