main page updated
merged