Tweaks to Index