Save on event instead of timer trigger