update code for late 2014 presentation