cool,  I just don't think we should add flexibility till it is needed but as it now has a use I'm fine although I'm not convinced we need to pass the context but I can live with it