minor adjustments according to instructions from 2014-04-29