Optimization

Only save state to be returned if owner is realy changed