moved wrapping to BEFORE initialisation