full changes since last review