Changed events slightly