Index properly