Fixed event logic and timestamp