modified index page
modified after merge