changed comparison stuff to just use operators