== changed to .equals for Strings