- Allowing user to be None
 - Changing target to context
 - Allowing context to be None
small fix