Change to use indexOf