Update after workshop 2014-07-22