Switched to using EqNumber isntead of raw BigDecimal