small changes
must shorten