Changed a function name to help stop conflict
Added a todo for deactivation of plugin