New wrapper logic.