Index Edit Fixed