Simplified on load code
removed unnecessary unwrapping and wrapping