added functionality for off

removed ability to pass context