Major Overhaul of the reset