played with the index page
merge conflicts