Changed event system quite a bit