Added wrapping and folding