updated index for better guard