Address review comments. 3.1 and 3.2