perserve context, pass arguments through and remove immediate
Release 2.0.0