Added the stuff from Matt's email