made source-add/source-remove events work