Updated to use Index