Changes to store index -Luke