Added long-word wrapper