modified index rightnow
solved conflicts