Tweaked the index with love from Andrew Lee, take 2