fixed all the events