Improving figure wrap.