added more very important stuff and index3
merged conflict on index2