added underscores and IndexOf