Updated based on the Updating the Index Page