Make short (22/32)

Make short