added timestamp and slimmed the overkill event-system