Add changes for second tech review