Replaced == with .equals()