updated page
merged stuff