editied events and added date info into functions