refactored unwrapping