Improve comparison?