Added yannis edits before sending to Amit