Replaced "==" with equals for string comparisons