Make short (30/32)

Make short