Make short (25/32)

Make short