updated reset function
removed pdb
fixed merge conflict