Updated review comments from Marco and Nikhil