most recent code from work with Annie in NYC