Eliminated oldEvent propagation and drastically simplified most of the code