[TASK] Bring back the wrapping