Fix everything except Reset.
Fix reset