Updated to match code for talk on 6/14/13