Better H1 wrapping