improve consistancy among events