Removed save option as not necessary any more
Fixed event loss problem