Code now incorporates Andres' matching estimations