Modifications to conditions in Index