To address Fernando's review comments.