Reset
Commented old code for possibly more efficient test code