Make short (26/32)

Make short