Address Marcos' review comments.