Incorporating additional tech review comments.