updates described here: https://github.etsycorp.com/gist/clynch/1266623