changed front page
merged