Added better comparison