Better unwrapping and wrapping but still not perfect