Made some tuning to event viewern