done with index page
done with index page, forgot deleting
merged