Updated indexes according to TomH suggestion