Small changes to index for states