Remaining changes from Bojan's email of 18 july 2014