Improve reset