Addressed review comments.

Plus added shrinkwrap.