Index now in options, resolved #4