22/05: Final merge with word wrap