Adding Hugh's write index removal