Rejiggled the indexing for random effects