Update comment and size check