fixed to ensure it doesnt erase evnets
fixed merge conflicts