reworking for 2014 workshop