updated front page
merged