Some changes with events and new parameters