Improved comparing stuff