better new events pushing and removed debug code