reverted again to fix the .off() problem