improved wrapper (redirect)