Changed indexing to reduce bandwidth usage, potentially slower in some case