Implement reset properly