Updates for Vid's comments.