Only update relevant indices