Fix and add compare