Updates from Franco comments