Event improvements continued(change place to fire event, improve delegates etc.)