updated to stateless system - more events instead