Update last patch to factor in width with full details