Added two more indices to gain performance