Adding @antgonza suggestions