Simplified the unwrapper