Update draft based on Andrew's email