Changed to use contains instead of equals