Modified how fire event value is returning new value
Cleaned up event firing