Use new enumerate method