Testing new event class
Fixed some save elements