Make short (21/32)

Make short