Update to support for all sizes

Update to support for all sizes