Changes agreed on the last meeting

@mkit