Added index to state
Preparing for release