Combined some indices to save on tensor memory overheads - much slower
now