Use short (24/47)

Use short