fixed up events