Modifications following David's review